projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e588667)
bitkeeper revision 1.1236.1.89 (423c8e60yT60EPF9qFf1_g26hhY3Jw)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sat, 19 Mar 2005 20:41:04 +0000 (20:41 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sat, 19 Mar 2005 20:41:04 +0000 (20:41 +0000)
manual merge.

linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig patch | blob | history

diff --git a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig
index 4b7915be29ec9abf0e1e169a451916f18f35079c..e906f9852142bd6dad0b27459bb266b6c7bd3ed7 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig
+++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig
@@ -899,16 +899,6 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 #
 # CONFIG_INFINIBAND is not set
 
-#
-# MMC/SD Card support
-#
-# CONFIG_MMC is not set
-
-#
-# InfiniBand support
-#
-# CONFIG_INFINIBAND is not set
-
 #
 # File systems
 #
Unnamed repository; edit this file 'description' to name the repository.